merge emacs-23
authorKenichi Handa <handa@m17n.org>
Sat, 2 Oct 2010 02:05:56 +0000 (11:05 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 2 Oct 2010 02:05:56 +0000 (11:05 +0900)

Trivial merge